Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 16:47:27 +0000 (09:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 18 Jul 2011 16:47:27 +0000 (09:47 -0700)

Trivial merge